Set Qt version floor at 5.9 (#304)

* move Qt floor to 5.9.

* update coverage build for Qt archive naming.

* update all travis builds to xenial.

trusty is EOL 4/2019.

* avoid 5.12.1 on linux CI.

* Revert "avoid 5.12.1 on linux CI."

This reverts commit b86212123cda9d7c57f212f3baf0f05bc3121ee5.

* avoid 5.12.1 on linux CI.

diff --git a/.travis.yml b/.travis.yml
index b9ac0bca3dc14fe3d696314dc8f1a453cd4337e5..0e02aac37e6cb7e4672b09b603d10542baba173f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,14 @@ language: cpp
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       services: docker
       compiler: gcc
       env:
         - BUILD_TYPE="docker"
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       services: docker
       compiler: clang
@@ -22,7 +22,7 @@ matrix:
       compiler: gcc
       env:
         - BUILD_TYPE="local"
-        - QT_VERSION="5.9.7"
+        - QT_VERSION="5.9.7" # 5.12.1 vtesto stmsdf fails differently on xenial & bionic
       addons:
         apt:
           packages:
@@ -59,7 +59,7 @@ matrix:
       compiler: gcc
       env:
         - BUILD_TYPE="coverage"
-        - QT_VERSION="5.7.1"
+        - QT_VERSION="5.9.7"
       addons:
         apt:
           packages:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 613a28d2d96b9d6e4ccdab6c691c9f2c8f59a0b3..c52e5bb4103ee583e777b042736707787f1c37cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ message("Qt5Core_DEFINITIONS List of definitions for use with add_definitions: \
 message("Qt5Core_COMPILE_DEFINITIONS List of definitions for use with the COMPILE_DEFINITIONS target property: \"${Qt5Core_COMPILE_DEFINITIONS}\"")
 message("Qt5Core_FOUND Boolean describing whether the module was found successfully: \"${Qt5Core_FOUND}\"")
 message("Qt5Core_EXECUTABLE_COMPILE_FLAGS String of flags to be used when building executables: \"${Qt5Core_EXECUTABLE_COMPILE_FLAGS}\"")
-if (${Qt5Core_VERSION} VERSION_LESS 5.7)
-  message(FATAL_ERROR "Qt version ${Qt5Core_VERSION} found, but version 5.7 or newer is required.")
+if (${Qt5Core_VERSION} VERSION_LESS 5.9)
+  message(FATAL_ERROR "Qt version ${Qt5Core_VERSION} found, but version 5.9 or newer is required.")
 endif()
 include_directories(AFTER SYSTEM ${Qt5Core_INCLUDE_DIRS})
 add_definitions(${Qt5Core_DEFINITIONS})

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 8adf38825a1b5e1a7ec640108c5cd849b568d8c3..7864f543b46eee70bbb62150a5b5bbb21e8580e2 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -1,6 +1,6 @@
 # Enforce minimum Qt version.
 # versionAtLeast() was introduced in Qt 5.10, so we can't count on it being available.
-MIN_QT_VERSION = 5.7 # major[.minor[.patch]]
+MIN_QT_VERSION = 5.9 # major[.minor[.patch]]
 MIN_QT_VERSION_COMPONENTS = $$split(MIN_QT_VERSION, .)
 MIN_QT_VERSION_MAJOR = $$member(MIN_QT_VERSION_COMPONENTS, 0)
 MIN_QT_VERSION_MINOR = $$member(MIN_QT_VERSION_COMPONENTS, 1)

diff --git a/configure b/configure
index e9d8693202cf374cf55be6641755648ea2b14e07..e7a61b37d153b96ad6074ffba0eeb957c15a5703 100755 (executable)
--- a/configure
+++ b/configure
@@ -6144,7 +6144,7 @@ fi
 
 
 # MIN_QT_VERSION in configure.ac should correspond to the QT_VERSION_CHECK arguments in main.cc and gui/main.cc
-MIN_QT_VERSION=5.7
+MIN_QT_VERSION=5.9
 if test "$QMAKE" = "no"; then :
 
        as_fn_error $? "Qt qmake (with QT_VERSION >= $MIN_QT_VERSION) is required but was not found." "$LINENO" 5

diff --git a/configure.ac b/configure.ac
index 3daf07cee5fd6b33353d9f903c5628f614a1b8ff..55812e1b290ec9757122e33a10d8a41d2358b242 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -167,7 +167,7 @@ AC_CHECK_TOOLS(LUPDATE, [lupdate-qt5 lupdate])
 AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease])
 
 # MIN_QT_VERSION in configure.ac should correspond to the QT_VERSION_CHECK arguments in main.cc and gui/main.cc
-MIN_QT_VERSION=5.7
+MIN_QT_VERSION=5.9
 AS_IF([test "$QMAKE" = "no"], [
        AC_MSG_ERROR([Qt qmake (with QT_VERSION >= $MIN_QT_VERSION) is required but was not found.])
 ])

diff --git a/gui/main.cc b/gui/main.cc
index f13d6943eecfd9e47114506d79268e2270f94e45..9ff9b7cf652b106d45b74403192535fd84951d83 100644 (file)
--- a/gui/main.cc
+++ b/gui/main.cc
@@ -45,7 +45,7 @@ const char *pathSeparator = ":";
 int main(int argc, char**argv)
 {
 // MIN_QT_VERSION in configure.ac should correspond to the QT_VERSION_CHECK arguments in main.cc and gui/main.cc
-#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 0))
   #error this version of Qt is not supported.
 #endif
 

diff --git a/main.cc b/main.cc
index 8990f1a24be745901749b75787680deba441ad6c..2d86a419377233a7dfcc710a17fcf7289444446d 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -230,7 +230,7 @@ main(int argc, char* argv[])
   (void) new gpsbabel::UsAsciiCodec(); /* make sure a US-ASCII codec is available */
 
 // MIN_QT_VERSION in configure.ac should correspond to the QT_VERSION_CHECK arguments in main.cc and gui/main.cc
-#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 0))
 #error This version of Qt is not supported.
 #endif
 

diff --git a/tools/travis_install_linux_coverage b/tools/travis_install_linux_coverage
index 6e18492bb5f1539d2a87b58b92563f7d7fb8c2e3..47974033962891f6cc8f1ad2c6a5652c53c3c901 100755 (executable)
--- a/tools/travis_install_linux_coverage
+++ b/tools/travis_install_linux_coverage
@@ -27,15 +27,12 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.7.1}
+QT_VERSION=${1:-5.12.1}
 QT_VERSION_SHORT=${QT_VERSION//./}
-# older Qt releases use different package names and install locations.
-QT_VERSION_XY=$(echo ${QT_VERSION} | cut -d "." -f -2)
-QT_VERSION_XY_SHORT=${QT_VERSION_XY//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.
 CACHEDIR=${HOME}/Cache
-QTDIR=${CACHEDIR}/Qt/${QT_VERSION_XY}/gcc_64
+QTDIR=${CACHEDIR}/Qt/${QT_VERSION}/gcc_64
 
 if [ -d "${QTDIR}/bin" ]; then
   echo "Using cached Qt."
@@ -46,7 +43,7 @@ else
   mkdir -p ${CACHEDIR}
   pushd ${CACHEDIR}
   # install-qt creates the install at $PWD/Qt.
-  QT_CI_PACKAGES=qt.${QT_VERSION_XY_SHORT}.gcc_64 QT_CI_DOWNLOADER="wget -nv -c" PATH=${TRAVIS_BUILD_DIR}/tools/qtci:${PATH} install-qt ${QT_VERSION}
+  QT_CI_PACKAGES=qt.qt5.${QT_VERSION_SHORT}.gcc_64 QT_CI_DOWNLOADER="wget -nv -c" PATH=${TRAVIS_BUILD_DIR}/tools/qtci:${PATH} install-qt ${QT_VERSION}
   popd
   validate
   rm ${CACHEDIR}/qt-opensource*.run

diff --git a/tools/travis_install_linux_local b/tools/travis_install_linux_local
index f8ddf1418c32db4e23496d81cc602991e926fd96..bf4fc21d68a4dd1b6cfdd3ba47d1b4eff88f5809 100755 (executable)
--- a/tools/travis_install_linux_local
+++ b/tools/travis_install_linux_local
@@ -27,7 +27,7 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.12.0}
+QT_VERSION=${1:-5.12.1}
 QT_VERSION_SHORT=${QT_VERSION//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.

diff --git a/tools/travis_install_osx b/tools/travis_install_osx
index 28fa80909b571a3b227b780d450846fdc47906f4..dc93015387446396b488b41f628a57cd14aa4a78 100755 (executable)
--- a/tools/travis_install_osx
+++ b/tools/travis_install_osx
@@ -27,7 +27,7 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.12.0}
+QT_VERSION=${1:-5.12.1}
 QT_VERSION_SHORT=${QT_VERSION//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.